src: Eliminate compiler warnings

diff --git a/src/shell-app-usage.c b/src/shell-app-usage.c
index 04b1d5b4137f8965577aa26702a9bde8ade97cb2..31e7f85c276beede687864886a7ea4cf64ee2b97 100644 (file)
--- a/src/shell-app-usage.c
+++ b/src/shell-app-usage.c
@@ -419,14 +419,13 @@ shell_app_usage_init (ShellAppUsage *self)
   self->currently_idle = FALSE;
   self->enable_monitoring = FALSE;
 
-  g_object_get (shell_global_get(), "userdatadir", &shell_userdata_dir, NULL),
+  g_object_get (global, "userdatadir", &shell_userdata_dir, NULL),
   path = g_build_filename (shell_userdata_dir, DATA_FILENAME, NULL);
   g_free (shell_userdata_dir);
   self->configfile = g_file_new_for_path (path);
   g_free (path);
   restore_from_file (self);
 
-
   self->privacy_settings = g_settings_new(PRIVACY_SCHEMA);
   g_signal_connect (self->privacy_settings,
                     "changed::" ENABLE_MONITORING_KEY,

diff --git a/src/shell-global.c b/src/shell-global.c
index 83f8c464d77bb1bf411259f69a22789b933d46d3..0ea3287b3a08479459e285f7888dc245ec592ac1 100644 (file)
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -1018,8 +1018,6 @@ void
 shell_global_end_modal (ShellGlobal *global,
                         guint32      timestamp)
 {
-  ClutterActor *actor;
-
   if (!global->has_modal)
     return;
 

diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c
index b686893c55e7feb1789a8d0184f9f71d91f37521..ed9d9b43cd9fbd0664b9292453fd4bccde53d39e 100644 (file)
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@@ -191,10 +191,8 @@ get_app_from_window_wmclass (MetaWindow  *window)
 {
   ShellApp *app;
   ShellAppSystem *appsys;
-  char *appid;
   const char *wm_class;
   const char *wm_instance;
-  char *with_desktop;
 
   appsys = shell_app_system_get_default ();
 
@@ -372,12 +370,9 @@ static ShellApp *
 get_app_for_window (ShellWindowTracker    *tracker,
                     MetaWindow            *window)
 {
-  ShellAppSystem *app_system;
   ShellApp *result = NULL;
   const char *startup_id;
 
-  app_system = shell_app_system_get_default ();
-
   /* First, we check whether we already know about this window,
    * if so, just return that.
    */